| commit | 0e47b23874132a7fffde3f56c7c4f13c1f0b8cc4 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Tue Jan 15 08:31:10 2008 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Tue Jan 15 08:31:10 2008 |
| tree | 224e0c2eaf36a7f35e3ef9cdc924a2f02ae3be06 | |
| parent | e77b015d156771d6b32769e7997c455adf9db4ab [diff] [blame] |
Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
diff --git a/git-rerere.txt b/git-rerere.txt index 3793267..a53858e 100644 --- a/git-rerere.txt +++ b/git-rerere.txt
@@ -22,6 +22,10 @@ initial manual merge, and later by noticing the same automerge results and applying the previously recorded hand resolution. +[NOTE] +You need to set the configuration variable rerere.enabled to +enable this command. + COMMANDS --------